Refactor `toJtdForm()` methods to use centralized converter with switch statement #26

Copilot · 2025-07-26T22:52:46Z

This PR refactors the JTD (JSON Type Definition) conversion logic as requested in the issue. Previously, each type class had its own toJtdForm() method implementation scattered across the codebase. This change centralizes all JTD conversion logic into a dedicated module with a clean router function.

Changes Made

Created centralized JTD converter module:

Added src/jtd/converter.ts with individual converter functions for each type (AnyType, BooleanType, ConstType, NumberType, StringType, ArrayType, ObjectType, TupleType, MapType, RefType, OrType, BinaryType, FunctionType)
Added main router function toJtdForm() that uses a switch statement to route each node type to its appropriate converter
Added src/jtd/index.ts to export the new converter functionality

Removed scattered toJtdForm() methods:

Removed method implementations from 6 type classes: AnyType, BooleanType, ConstType, NumberType, StringType (all had custom implementations)
Updated AbstractType.toJtdForm() to delegate to the centralized converter using dynamic import to avoid circular dependencies

Preserved exact functionality:

All existing behavior is maintained - the same JTD forms are generated for each type
Added comprehensive test suite (src/jtd/__tests__/converter.spec.ts) to verify all conversions work correctly
All existing tests continue to pass (488 tests passing)

The refactor improves code organization by following the single responsibility principle and makes the JTD conversion logic more maintainable by centralizing it in one location with a clear switch-based routing mechanism.

Fixes #25.

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

… statement Co-authored-by: streamich <9773803+streamich@users.noreply.github.com>

streamich

Run yarn prettier in the end to format codebase.

streamich · 2025-07-27T08:53:28Z

src/jtd/converter.ts

+/**
+ * JTD form converter for BooleanType.
+ */
+export function convertBooleanType(type: BooleanType): jtd.JtdTypeForm {


Inline all individual type converters, such as convertBooleanType, inside the main toJtdForm function.

Done. All individual type converters have been inlined into the main toJtdForm function switch statement. (2088833)

streamich · 2025-07-27T08:56:46Z

src/jtd/converter.ts

+    case 'bin':
+      return convertBinaryType(type as BinaryType<any>);


Wrap each case in a block.

Suggested change

case 'bin':

return convertBinaryType(type as BinaryType<any>);

case 'bin': {

return convertBinaryType(type as BinaryType<any>);

}

Done. Each case is now wrapped in a block with curly braces. (2088833)

streamich · 2025-07-27T09:00:13Z

src/jtd/converter.ts

+export function toJtdForm(type: AbstractType<any>): jtd.JtdForm {
+  const typeName = type.getTypeName();


Make this method work Schema instead, which is returned from AbstractType.getSchema().

Suggested change

export function toJtdForm(type: AbstractType<any>): jtd.JtdForm {

const typeName = type.getTypeName();

export function toJtdForm(schema: Schema): jtd.JtdForm {

const typeName = schema.kind;

Done. The method now works with Schema instead of AbstractType and uses schema.kind to determine the type. (2088833)

…s in blocks Co-authored-by: streamich <9773803+streamich@users.noreply.github.com>

Copilot · 2025-07-27T09:10:55Z

Run yarn prettier in the end to format codebase.

Done. Formatted the codebase using yarn format --write (Biome formatter). (2088833)

streamich

Run yarn prettier in the end.

streamich · 2025-07-27T10:11:06Z

src/jtd/converter.ts

+      switch (numSchema.format) {
+        case 'u8':
+          return {type: 'uint8'};
+        case 'u16':
+          return {type: 'uint16'};
+        case 'u32':
+          return {type: 'uint32'};
+        case 'i8':
+          return {type: 'int8'};
+        case 'i16':
+          return {type: 'int16'};
+        case 'i32':
+          return {type: 'int32'};
+        case 'f32':
+          return {type: 'float32'};
+        default:
+          return {type: 'float64'};
+      }


Make it a map:

Suggested change

switch (numSchema.format) {

case 'u8':

return {type: 'uint8'};

case 'u16':

return {type: 'uint16'};

case 'u32':

return {type: 'uint32'};

case 'i8':

return {type: 'int8'};

case 'i16':

return {type: 'int16'};

case 'i32':

return {type: 'int32'};

case 'f32':

return {type: 'float32'};

default:

return {type: 'float64'};

}

return {type: NUMS_TYPE_MAPPING.get(numSchema.format) ?? 'float64'};

Done. Replaced the switch statement with a Map lookup for cleaner code. (0da55d2)

streamich · 2025-07-27T10:11:50Z

src/jtd/converter.ts

+    case 'or': {
+      // OrType is complex - for simplicity, convert to empty form
+      // In a full implementation, this might need to be a discriminator form
+      const form: jtd.JtdEmptyForm = {nullable: false};
+      return form;
+    }
+    case 'bin': {
+      // Binary types don't have a direct JTD equivalent, fall back to default
+      const form: jtd.JtdEmptyForm = {nullable: false};
+      return form;
+    }
+    case 'fn': {
+      // Function types don't have a direct JTD equivalent, fall back to default
+      const form: jtd.JtdEmptyForm = {nullable: false};
+      return form;
+    }
+    case 'fn$': {
+      // Streaming function types don't have a direct JTD equivalent, fall back to default
+      const form: jtd.JtdEmptyForm = {nullable: false};
+      return form;
+    }
+    default: {
+      const form: jtd.JtdEmptyForm = {nullable: false};
+      return form;
+    }


Remove comments.

Combine switch statements.

Done. Removed comments and combined the switch statements for unsupported types (or, bin, fn, fn$) into a single case with fallthrough. (0da55d2)

…switch cases, and format with prettier Co-authored-by: streamich <9773803+streamich@users.noreply.github.com>

Copilot · 2025-07-27T10:22:12Z

Run yarn prettier in the end.

Done. Formatted the entire codebase using npx prettier --write. (0da55d2)

streamich

LGTM

github-actions · 2025-07-27T23:19:27Z

🎉 This PR is included in version 1.4.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Initial plan

3a9ce0c

Copilot AI assigned Copilot and streamich Jul 26, 2025

Copilot started work on behalf of streamich July 26, 2025 22:52 View session

Refactor toJtdForm() methods to use centralized converter with switch…

948523b

… statement Co-authored-by: streamich <9773803+streamich@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Refactor type toJtdForm() methods~~ Refactor toJtdForm() methods to use centralized converter with switch statement Jul 26, 2025

Copilot AI requested a review from streamich July 26, 2025 23:08

Copilot finished work on behalf of streamich July 26, 2025 23:08

streamich marked this pull request as ready for review July 27, 2025 08:46

streamich requested changes Jul 27, 2025

View reviewed changes

Copilot started work on behalf of streamich July 27, 2025 09:00 View session

Refactor toJtdForm to accept Schema, inline converters, and wrap case…

2088833

…s in blocks Co-authored-by: streamich <9773803+streamich@users.noreply.github.com>

Copilot finished work on behalf of streamich July 27, 2025 09:12

Copilot AI requested a review from streamich July 27, 2025 09:12

streamich requested changes Jul 27, 2025

View reviewed changes

Copilot started work on behalf of streamich July 27, 2025 10:12 View session

Address PR feedback: replace number mapping switch with Map, combine …

0da55d2

…switch cases, and format with prettier Co-authored-by: streamich <9773803+streamich@users.noreply.github.com>

Copilot AI requested a review from streamich July 27, 2025 10:22

Copilot finished work on behalf of streamich July 27, 2025 10:22

streamich added 2 commits July 27, 2025 12:34

Merge branch 'master' into copilot/fix-25

0a99549

style: 💄 fix linter issues

ce7b822

streamich approved these changes Jul 27, 2025

View reviewed changes

streamich merged commit 3bac6b2 into master Jul 27, 2025
2 checks passed

streamich deleted the copilot/fix-25 branch July 27, 2025 14:55

github-actions bot added the released label Jul 27, 2025

		case 'bin':
		return convertBinaryType(type as BinaryType<any>);

		export function toJtdForm(type: AbstractType<any>): jtd.JtdForm {
		const typeName = type.getTypeName();

Uh oh!

Refactor toJtdForm() methods to use centralized converter with switch statement #26

Refactor toJtdForm() methods to use centralized converter with switch statement #26

Uh oh!

Conversation

Copilot AI commented Jul 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

Uh oh!

streamich left a comment

Choose a reason for hiding this comment

Uh oh!

streamich Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

streamich Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

streamich Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Jul 27, 2025

Uh oh!

streamich left a comment

Choose a reason for hiding this comment

Uh oh!

streamich Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

streamich Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Jul 27, 2025

Uh oh!

streamich left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jul 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Refactor `toJtdForm()` methods to use centralized converter with switch statement #26

Refactor `toJtdForm()` methods to use centralized converter with switch statement #26

Copilot AI commented Jul 26, 2025 •

edited

Loading